refix merge conflict