Resolve conflicts
Commit the project
commit the project