simple change
merge

Conflicts:
	smart.c