fixed the merge conflicts