Remove leftover line from merge