merging from hashicorp