conflict resolution
working state without cleanup