current state
diffconflicts