Master merge candidate
Branched
Merges conflict