fix some merge conflict issues