restored a line that was left out by an automatic merge