initial commit
Merge conflict in gitignore