remove files that were readded in merge