adding project files
Resolving conflict