merging with the master