after conflict fix