Initialize project
Resolve conflicts