add merge, rebase. first draft.