creating project.
updating gitignore file.
merging conflicts.