State before implementing custom conflict discovery