showing example merge conflict
merge should be fixed