merchant ctrl updates/xeditable removal