removed merge line and added interactive cursor rendering