merge error avoidance