possible conflict fix