diff --git a/models/FreeLeeModel.cpp b/models/FreeLeeModel.cpp
index 547885b8..5d0f64f6 100644
--- a/models/FreeLeeModel.cpp
+++ b/models/FreeLeeModel.cpp
@@ -9,7 +9,7 @@ color lattice boltzmann model
 #include <stdlib.h>
 #include <time.h>
 
-ScaLBL_FreeLeeModel::ScaLBL_FreeLeeModel(int RANK, int NP, MPI_Comm COMM):
+ScaLBL_FreeLeeModel::ScaLBL_FreeLeeModel(int RANK, int NP, const Utilities::MPI& COMM):
 rank(RANK), nprocs(NP), Restart(0),timestep(0),timestepMax(0),tauA(0),tauB(0),rhoA(0),rhoB(0),W(0),gamma(0),
 Fx(0),Fy(0),Fz(0),flux(0),din(0),dout(0),inletA(0),inletB(0),outletA(0),outletB(0),
 Nx(0),Ny(0),Nz(0),N(0),Np(0),nprocx(0),nprocy(0),nprocz(0),BoundaryCondition(0),Lx(0),Ly(0),Lz(0),comm(COMM)
@@ -107,9 +107,9 @@ void ScaLBL_FreeLeeModel::SetDomain(){
 	id = new signed char [N];
 	for (int i=0; i<Nx*Ny*Nz; i++) Dm->id[i] = 1;               // initialize this way
 
-	MPI_Barrier(comm);
+	comm.barrier()
 	Dm->CommInit();
-	MPI_Barrier(comm);
+	comm.barrier()
 	// Read domain parameters
 	rank = Dm->rank();	
 	nprocx = Dm->nprocx();
@@ -206,8 +206,8 @@ void ScaLBL_FreeLeeModel::Create(){
 	if (rank==0)    printf ("Set up memory efficient layout, %i | %i | %i \n", Np, Npad, N);
 	Map.resize(Nx,Ny,Nz);       Map.fill(-2);
 	auto neighborList= new int[18*Npad];
-	Np = ScaLBL_Comm->MemoryOptimizedLayoutAA(Map,neighborList,Mask->id,Np,2);
-	MPI_Barrier(comm);
+	Np = ScaLBL_Comm->MemoryOptimizedLayoutAA(Map,neighborList,Mask->id.data(),Np,2);
+	comm.barrier()
 
 	//...........................................................................
 	//                MAIN  VARIABLES ALLOCATED HERE
@@ -335,7 +335,7 @@ void ScaLBL_FreeLeeModel::Initialize(){
 		ScaLBL_CopyToDevice(Phi,cPhi,N*sizeof(double));
 		ScaLBL_DeviceBarrier();
 
-		MPI_Barrier(comm);
+		comm.barrier()
 	}
 
 	if (rank==0)	printf ("Initializing phase field \n");
@@ -371,7 +371,7 @@ void ScaLBL_FreeLeeModel::Run(){
 	//.......create and start timer............
 	double starttime,stoptime,cputime;
 	ScaLBL_DeviceBarrier();
-	MPI_Barrier(comm);
+	comm.barrier()
 	starttime = MPI_Wtime();
 	//.........................................
 
diff --git a/models/FreeLeeModel.h b/models/FreeLeeModel.h
index 01fb54c3..437f48b3 100644
--- a/models/FreeLeeModel.h
+++ b/models/FreeLeeModel.h
@@ -18,7 +18,7 @@ Implementation of Lee et al JCP 2016 lattice boltzmann model
 
 class ScaLBL_FreeLeeModel{
 public:
-	ScaLBL_FreeLeeModel(int RANK, int NP, MPI_Comm COMM);
+  ScaLBL_FreeLeeModel(int RANK, int NP, const Utilities::MPI& COMM);
 	~ScaLBL_FreeLeeModel();	
 	
 	// functions in they should be run
@@ -70,7 +70,7 @@ public:
 	DoubleArray SignDist;
 		
 private:
-	MPI_Comm comm;
+	Utilities::MPI comm;
     
 	int dist_mem_size;
 	int neighborSize;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2bb810bd..414a13cf 100755
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,13 +4,8 @@
 ADD_LBPM_EXECUTABLE( lbpm_color_simulator )
 ADD_LBPM_EXECUTABLE( lbpm_permeability_simulator )
 ADD_LBPM_EXECUTABLE( lbpm_greyscale_simulator )
-<<<<<<< HEAD
-ADD_LBPM_EXECUTABLE( lbpm_greyscaleColor_simulator )
-ADD_LBPM_EXECUTABLE( lbpm_electrokinetic_SingleFluid_simulator )
-=======
 ADD_LBPM_EXECUTABLE( lbpm_electrokinetic_SingleFluid_simulator )
 ADD_LBPM_EXECUTABLE( lbpm_greyscaleColor_simulator )
->>>>>>> FOM
 #ADD_LBPM_EXECUTABLE( lbpm_BGK_simulator )
 #ADD_LBPM_EXECUTABLE( lbpm_color_macro_simulator )
 ADD_LBPM_EXECUTABLE( lbpm_dfh_simulator )
diff --git a/tests/TestMRT.cpp b/tests/TestMRT.cpp
index 5b58130e..172f6c55 100644
--- a/tests/TestMRT.cpp
+++ b/tests/TestMRT.cpp
@@ -804,13 +804,8 @@ int main(int argc, char **argv)
 
 	}
 	// ****************************************************
-<<<<<<< HEAD
 	comm.barrier();
 	Utilities::shutdown();
-=======
-	MPI_Barrier(comm);
-	MPI_Finalize();
->>>>>>> electrokinetic
 	// ****************************************************
 
 	return check;