Removed text from merge conflict