Github conflict badly resolved