merge the history branch