Remove left over line from merge conflict