Resolved conflict

Resolved conflict
Merge branch 'UAT' of https://github.com/subodh4codaemon/redlemon into UAT