merge comments from gun design section