Undo unintended consequences of merge