made conflicting changes directly on github