merging the two branches