add direct setting by :content => Hash
add a merge function
Merge branch 'merge'