Great Plains, Westar revise $14 billion merger to ease regulator concerns