removed all the merge conflicts