merging all branches