diff --git a/pom.xml b/pom.xml
index 82416647f2..303aada8cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,6 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>git-client</artifactId>
-      <version>3.12.0</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
@@ -153,26 +152,6 @@
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
-<!--<<<<<<< HEAD-->
-<!--=======-->
-<!--      <exclusions>-->
-<!--        &lt;!&ndash; prevent upper bounds dependency error &ndash;&gt;-->
-<!--        <exclusion>-->
-<!--          <groupId>javax.annotation</groupId>-->
-<!--          <artifactId>javax.annotation-api</artifactId>-->
-<!--        </exclusion>-->
-<!--        <exclusion>-->
-<!--          <groupId>com.google.errorprone</groupId>-->
-<!--          <artifactId>error_prone_annotations</artifactId>-->
-<!--        </exclusion>-->
-<!--      </exclusions>-->
-<!--    </dependency>-->
-<!--    <dependency>-->
-<!--      <groupId>org.hamcrest</groupId>-->
-<!--      <artifactId>hamcrest</artifactId>-->
-<!--      <version>2.2</version>-->
-<!--      <scope>test</scope>-->
-<!--&gt;>>>>>> 742fd4cf (Init git maintenance)-->
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/src/main/java/jenkins/plugins/git/maintenance/Cron.java b/src/main/java/jenkins/plugins/git/maintenance/Cron.java
index d45e9e4dda..889dc6d340 100644
--- a/src/main/java/jenkins/plugins/git/maintenance/Cron.java
+++ b/src/main/java/jenkins/plugins/git/maintenance/Cron.java
@@ -13,7 +13,7 @@ public class Cron extends PeriodicWork {
 
     @Override
     public long getInitialDelay(){
-        return MIN - (Calendar.getInstance().get(Calendar.SECOND) * 1000);
+        return MIN - (Calendar.getInstance().get(Calendar.SECOND) * 1000L);
     }
 
     @Override