a whole git painful time of merging after switching branches and blah blah blah