Fixed merge conflict from earlier

jamesmortensen · jamesmortensen · commit bf02073d680f · 2022-06-20T15:40:15.000+05:30
diff --git a/StandaloneFirefox/Dockerfile b/StandaloneFirefox/Dockerfile
@@ -2,11 +2,7 @@
 # NOTE: DO *NOT* EDIT THIS FILE.  IT IS GENERATED.
 # PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-<<<<<<< HEAD
 FROM seleniarm/node-firefox:4.1.4-20220429
-=======
-FROM selenium/node-firefox:4.2.1-20220531
->>>>>>> trunk
 LABEL authors=SeleniumHQ
 
 USER 1200
