index flat conflict fixed