Merge Master with Logic