Add full empty project
Merge conflict in gitignore