css editable fix
add context menu
conflict merge
context menu