add currentEditingObj
manual fix of conflict