Github conflict fix