fix conflicts and delete hybrid img

Author: wanchaol

_static/img/hybrid.png

@@ -201,7 +201,7 @@ Production Usage
    :figure: _static/img/torchscript.png
 
 .. customgalleryitem::
-   :figure: /_static/img/hybrid.png
+   :figure: /_static/img/torchscript.png
    :tooltip: Experiment with some of the key features of the TorchScript
    :description: :doc:`beginner/deploy_seq2seq_hybrid_frontend_tutorial`