Merge with github