fix merge conflict errow