merge conflict practice