some conflict fix