arangodb#80 fix merge error

Author: aburmeis

src/main/java/com/arangodb/springframework/repository/query/DerivedArangoQuery.java

@@ -22,11 +22,11 @@
 
 import com.arangodb.entity.IndexEntity;
 import com.arangodb.entity.IndexType;
+import com.arangodb.model.AqlQueryOptions;
 import com.arangodb.springframework.core.ArangoOperations;
 import com.arangodb.springframework.repository.query.derived.BindParameterBinding;
 import com.arangodb.springframework.repository.query.derived.DerivedQueryCreator;
 import org.springframework.data.repository.query.parser.PartTree;
-import org.springframework.data.util.Pair;
 
 import java.util.Collection;
 import java.util.LinkedList;
@@ -55,7 +55,8 @@ public DerivedArangoQuery(final ArangoQueryMethod method, final ArangoOperations
 	@Override
 	protected QueryWithCollections createQuery(
             final ArangoParameterAccessor accessor,
-            final Map<String, Object> bindVars) {
+		final Map<String, Object> bindVars,
+		final AqlQueryOptions options) {
 
 		return new DerivedQueryCreator(mappingContext, domainClass, tree, accessor, new BindParameterBinding(bindVars),
 				geoFields).createQuery();

src/main/java/com/arangodb/springframework/repository/query/StringBasedArangoQuery.java

@@ -20,6 +20,7 @@
 
 package com.arangodb.springframework.repository.query;
 
+import com.arangodb.model.AqlQueryOptions;
 import com.arangodb.springframework.annotation.Document;
 import com.arangodb.springframework.annotation.Edge;
 import com.arangodb.springframework.core.ArangoOperations;
@@ -94,7 +95,8 @@ public StringBasedArangoQuery(final String query, final ArangoQueryMethod method
 	@Override
 	protected QueryWithCollections createQuery(
             final ArangoParameterAccessor accessor,
-            final Map<String, Object> bindVars) {
+		final Map<String, Object> bindVars,
+		final AqlQueryOptions options) {
 
 		extractBindVars(accessor, bindVars);