A merge of the second line after rebaseing