Another conflict fix