fixing the merge conflicts