new update from github for conflict