lost change during merge