Initialized the project
fixed merge conflicts in .gitignore file