fix some merge conflict in master branch