Fix derp in merge

Accidentally added a line number