Merge master branches