creating a merge conflict
creating merge conflict
resolving merge conflict