Collision part fixed + ignored
qsdqsdfsdf
dqsfsqdfqdsf
qdmfklqjsdfmlkjsdfmlkdsf

Conflicts:
	.gitignore
qsdfqsdfqdgqsg