previous merge conflict hacked off a line, putting it back