added attr_accessible
merge