Note #7 Good video on Merge and Rebase!