fix(db): implement proposed conflict handling#21

cadenkoj merged 1 commit intomaincadenkoj/dtim:mainfrom

05-22-fix_db_implement_proposed_conflict_handlingcadenkoj/dtim:05-22-fix_db_implement_proposed_conflict_handlingCopy head branch name to clipboard