merge DS files
fixed forms