fix snapshot from bad merge