+ added ConflictState to getCurrentState