fix Merge github