Removed conflict solved text
For Staging...
Merge branch 'staging'