Fix extra line from merge conflict