diff --git a/common/requirements.txt b/common/requirements.txt
index 4f4c22d..546f050 100644
--- a/common/requirements.txt
+++ b/common/requirements.txt
@@ -15,4 +15,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 python-constraint
-https://github.com/chipsalliance/f4pga/archive/c342fc6ff1684f3dc6072713730ac9fc574ab2f3.zip#subdirectory=f4pga
+https://github.com/chipsalliance/f4pga/archive/cad8afe0842cd73f5b73949fa12eab1fda326055.zip#subdirectory=f4pga
diff --git a/eos-s3/btn_counter/Makefile b/eos-s3/btn_counter/Makefile
index 8ee87e3..3fa806c 100644
--- a/eos-s3/btn_counter/Makefile
+++ b/eos-s3/btn_counter/Makefile
@@ -14,7 +14,6 @@ all:
 	  -dump openocd \
 	  -dump header \
 	  -dump binary
->>>>>>> 3d9062c (eos-s3/btn_counter/Makefile: dump jlink, openocd, header and binary)
 else
 all:
 	f4pga -vvv build --flow ./flow.json