Added some code on feature branch
Added code on the main branch
Merge branch 'feature_x'

Conflicts:
	Main.cs
Committing gitignore file changes