Commits current project status
resolve conflict