Probably should look at what git does with the merge before pushing...