Handle server sync conflicts with explicit resolution actions#385

pradeeban merged 1 commit intoControlCore-Project:devControlCore-Project/concore-editor:devfrom

avinxshKD:fix/server-sync-conflict-flowavinxshKD/concore-editor:fix/server-sync-conflict-flowCopy head branch name to clipboard