diff --git a/include/sta/drivers/bmi088.hpp b/include/sta/drivers/bmi088.hpp
index caf363f..41b5484 100644
--- a/include/sta/drivers/bmi088.hpp
+++ b/include/sta/drivers/bmi088.hpp
@@ -1,18 +1,8 @@
 #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>
 #include <sta/bus/spi/device.hpp>
 #include <sta/bus/i2c/device.hpp>
-=======
-#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>