more cherry pick

just testing all the git i can

trying to figure out, how this branch/merge foo does work

test for cherry pick