Minimum Merge Conflicts

Company: User Submitted_18thjuly

Difficulty: medium