Removed files with merge conflict