diff --git a/GPy/core/gp_grid.py b/GPy/core/gp_grid.py
index 64815016..adf611b8 100644
--- a/GPy/core/gp_grid.py
+++ b/GPy/core/gp_grid.py
@@ -69,10 +69,17 @@ class GpGrid(GP):
             x = b
             N = 1
             G = np.zeros(D)
+<<<<<<< HEAD
             for d in range(D):
                 G[d] = len(A[d])
             N = np.prod(G)
             for d in range(D-1, -1, -1):
+=======
+            for d in xrange(D):
+                G[d] = len(A[d])
+            N = np.prod(G)
+            for d in xrange(D-1, -1, -1):
+>>>>>>> 1fc93236c46ddd1b7bd7f73ef26dc51af4cd2181
                 X = np.reshape(x, (G[d], round(N/G[d])), order='F')
                 Z = np.dot(A[d], X)
                 Z = Z.T
diff --git a/GPy/inference/latent_function_inference/gaussian_grid_inference.py b/GPy/inference/latent_function_inference/gaussian_grid_inference.py
index aeefa8e7..b9702b92 100644
--- a/GPy/inference/latent_function_inference/gaussian_grid_inference.py
+++ b/GPy/inference/latent_function_inference/gaussian_grid_inference.py
@@ -37,10 +37,17 @@ class GaussianGridInference(LatentFunctionInference):
         N = 1
         D = len(A)
         G = np.zeros((D,1))
+<<<<<<< HEAD
         for d in range(0, D):
             G[d] = len(A[d])
         N = np.prod(G)
         for d in range(D-1, -1, -1):
+=======
+        for d in xrange(0, D):
+            G[d] = len(A[d])
+        N = np.prod(G)
+        for d in xrange(D-1, -1, -1):
+>>>>>>> 1fc93236c46ddd1b7bd7f73ef26dc51af4cd2181
             X = np.reshape(x, (G[d], round(N/G[d])), order='F')
             Z = np.dot(A[d], X)
             Z = Z.T
@@ -109,6 +116,6 @@ class GaussianGridInference(LatentFunctionInference):
         dL_dLen = derivs[:D]
         dL_dVar = derivs[D]
         dL_dThetaL = derivs[D+1]
-
+        
         return GridPosterior(alpha_kron=alpha_kron, QTs=QTs, Qs=Qs, V_kron=V_kron), \
                 log_likelihood, {'dL_dLen':dL_dLen, 'dL_dVar':dL_dVar, 'dL_dthetaL':dL_dThetaL}
diff --git a/GPy/kern/__init__.py b/GPy/kern/__init__.py
index b304cc7f..d8d63ae9 100644
--- a/GPy/kern/__init__.py
+++ b/GPy/kern/__init__.py
@@ -29,6 +29,8 @@ from .src.splitKern import SplitKern,DEtime
 from .src.splitKern import DEtime as DiffGenomeKern
 from .src.spline import Spline
 from .src.basis_funcs import LogisticBasisFuncKernel, LinearSlopeBasisFuncKernel, BasisFuncKernel, ChangePointBasisFuncKernel, DomainKernel
+from .src.grid_kerns import GridRBF
+
 from .src.sde_matern import sde_Matern32
 from .src.sde_matern import sde_Matern52
 from .src.sde_linear import sde_Linear
@@ -36,4 +38,3 @@ from .src.sde_standard_periodic import sde_StdPeriodic
 from .src.sde_static import sde_White, sde_Bias
 from .src.sde_stationary import sde_RBF,sde_Exponential,sde_RatQuad
 from .src.sde_brownian import sde_Brownian
-from .src.grid_kerns import GridRBF