fix conflict of branch merging