prepare to merge with github