merge with github