resolving merge conflicts
merge
merge