Merging the master branches