logger method
solved conflict

Conflicts:
	dsh.c