remove conflicting files from version control