[cleanup] re-remove files added in merge and remove executable bit again