Merge New structure to Master