readded entry lost in manual merge