diff --git a/include/sta/drivers/bmi088.hpp b/include/sta/drivers/bmi088.hpp
index 4c2709b..caf363f 100644
--- a/include/sta/drivers/bmi088.hpp
+++ b/include/sta/drivers/bmi088.hpp
@@ -1,6 +1,7 @@
 #ifndef STA_DRIVERS_BMI088_HPP
 #define STA_DRIVERS_BMI088_HPP
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 //#include <sta/devices/stm32/bus/spi.hpp>
 //#include <sta/devices/stm32/bus/i2c.hpp>
@@ -9,6 +10,9 @@
 =======
 #include <sta/bus/spi/device.hpp>
 >>>>>>> 2e8b075 (Added mock driver; renamed enums and fixed a bug)
+=======
+#include <sta/bus/spi/device.hpp>
+>>>>>>> 86456b898b23d4c97f2314301d4924bb93e7a2d2
 
 #include <sta/drivers/bmi088_defs.hpp>
 
@@ -23,6 +27,7 @@ namespace sta
 			SUSPEND						= 0x80,
 			DEEP_SUSPEND				= 0x20
     	};
+
     	enum GyroRange
 		{
     		_2000	= 0x00,
@@ -31,6 +36,7 @@ namespace sta
 			_250	= 0x03,
 			_125	= 0x04
 		};
+
     	enum GyroBandwidth
 		{
     		_2000_532	= 0x00,