Change that will conflict with future cherry-pick to development
Change that will conflict with future merge to development
Change that will conflict with future merge to development
Oops, an accidental change on the wrong branch.
Let's cherry-pick it to the proper branch
And figure out how to restore git's notion of history