Remove files that cause conflicts