Removed lines from merge conflict