Docs: resolve conflict

diff --cc docs/Benchmarks.mdr
index 64ef668656df67e81cb9348ef070ed5e02624cf9,bbacd653f94ef02b3f95aed9eb221393190bdc66..be3d5fb6a871c6fc55723b99705d280099d449c8
--- 1/docs/Benchmarks.mdr
--- 2/docs/Benchmarks.mdr
+++ b/docs/Benchmarks.mdr
@@@ -1,10 -1,7 +1,8 @@@
  # Benchmarks
  
- 
 +> @hide date
- 
 +> @hide cd Gwion; git log -n1
  ## test
 -
 -<table><tr><td align="center">
 -@hide for a in $(find benchmark/results -type f -name "*.png"); do echo "<a href=:gwion:><img class=\"zoom\" src=\"./$(echo "$a" | sed 's/benchmark\/results/assets/')\" width=\"352px\"></a>"; done
 -</td></tr></table>
 +<table><tr><td align="center" style="border:none">
 +@hide bash scripts/list_benchmarks.sh
- </td></tr></table>
++</td></tr></table>