diff --git a/README.md b/README.md
index df9dde36290cfe1d83cf93bd694c962a7a5303ae..387016e3daa5ec71f37f6bf56992f299f43a8cea 100644
--- a/README.md
+++ b/README.md
@@ -54,9 +54,15 @@ How to run it
 
 	2.4 2D cartesian parallel (along p and kr)
 
+<<<<<<< HEAD
 #2.5 GK Sugama collision operator
 
 	2.6 GPU accelerated version
+=======
+#	2.5 GK Sugama collision operator
+
+  2.6 GPU accelerated version
+>>>>>>> e0f1973e4234da1ac2089c60ed313fed401da75d
 
 	2.7 GK Full Coulomb collision operator