Adding project
Resolving conflicts