add exercise to handle merge conflict