Resolving merge conflicts
Manual Resolution