add setter
merge