fix the merge conflicts