hashmap changed
merge resolved