Implement Offering Sync Conflict Resolution#205

mrmoney10010-design wants to merge 1 commit intoRevoraOrg:masterRevoraOrg/Revora-Backend:masterfrom

mrmoney10010-design:mastermrmoney10010-design/Revora-Backend:masterCopy head branch name to clipboard