rebase/merging changes from upstream with my settings from my personal macbook air