Resolved merge conflicts

Author: tkyc

src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerDataSource.java

@@ -1470,8 +1470,7 @@ public interface ISQLServerDataSource extends javax.sql.CommonDataSource {
      * @return cacheBulkCopyMetadata boolean value
      */
     boolean getcacheBulkCopyMetadata();
-<<<<<<< HEAD
-  
+
    /**
      * Returns value of 'retryExec' from Connection String.
      *