#98 Conflict condition special commit

Probably this is rare case, but we need workflow for it.