Fix git merge to help with rebase
Fix git merge to help with rebase
Fix git merge to help with rebase