commit from github for conflict