realyy want a conflict
Merge branch 'master' of https://github.com/breakingbad90/Sample

Conflicts:
	resolved