git init project
Merge with upstream