inline editing for cms
merge