raise ConfigurationError for unknown merge_methods
document merge_method
update CHANGES.txt for 1.6