merge conflicts exercise
merge
add method