upd: area editor
upd: fixed conflict