fix some merge conflict