Git merge and rebase

Git merge and rebase