small conflict fix