Fixing fidangled merge