fixed the merge conflict