testing the merge conflicts