Merge Affiliate model 1.5.5.1