Master merge commit / conflict resolution