Redo changes that got lost during merge