Add conflict resolution instructions to staging.yaml