[editomodel] merge conflict
[editmodel] small fix