merging.
resolving merge conflict