Jane and Joe on master commited
Blue Hat, Purple Hat commited on myBranch
Merge branch 'myBranch'

I want to keep both of the features. (merged while on master)