Conflicts:
	.DS_Store