diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7df8b6a..3f18fe4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,6 @@ inocode:
       - git clone "${GITREMDEB}"
       - cd "${CI_PROJECT_DIR}/arduino/${CI_PROJECT_NAME}"
       - cp "${CI_PROJECT_NAME}.example.h" "${CI_PROJECT_NAME}.h"
->>>>>>> 8904574aea20d843135b548ad44a254e42da4d2b
       - /arduino-nightly/arduino --verify "${CI_PROJECT_NAME}.ino"
 
 yaml: