Create project
Resolve conflict