merge conflicts exercise