add project, resolve conflict