Layer on the merge conflicts resulting from this fun scenario...