fixed lost conflict