Fixing Merge Conflicts between Master and Dev