merging a whole bunch of commits into one