The Start
merged conflict in .gitignore