fixed wonky merge artifact