Add conflict resolution instructions to staging.yaml
Merge pull request #4069 from dimagi/staging-conflict

Add conflict resolution instructions to staging.yaml