merge DS files
fixed forms
resolved merge conflicts