updated before conflict