Lost changes during merge