Fixes conflit
 Changes to be committed:
	modified:   .gitignore