Fix incorrect affiliates page URL
Fixed merge conflicts
Fixed merge conflict
Fixed merge conflict
Fixed merge conflict