fixing mergin