import { ConflictResolver } from '@cap-rel/smartcommon';