shift position of rates
marketing model conflict resolved
fixed template rate issue
Merge remote-tracking branch 'origin/69.1-marketing-campaigns' into UAT
Merge branch 'UAT' of https://github.com/sabahulh/redlemon into UAT
Merge remote-tracking branch 'origin/UAT'