remove files that cause conflicts