diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09328c3..3184b87 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,10 @@ link_directories(
 	${PCL_LIBRARY_DIRS}
 )
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 08e893cda5c52c675c04908d85821af18a89adb7
 generate_messages(
  DEPENDENCIES
  geometry_msgs
@@ -85,8 +88,12 @@ catkin_package(
   DEPENDS EIGEN3 PCL
   INCLUDE_DIRS
 )
+<<<<<<< HEAD
 
 add_executable(pointlio_mapping src/laserMapping.cpp 
+=======
+add_executable(pointlio_mapping src/laserMapping.cpp
+>>>>>>> 08e893cda5c52c675c04908d85821af18a89adb7
                 src/li_initialization.cpp src/parameters.cpp src/preprocess.cpp src/Estimator.cpp 
                 src/IMU_Processing.cpp)
 target_link_libraries(pointlio_mapping ${catkin_LIBRARIES} ${PCL_LIBRARIES} ${PYTHON_LIBRARIES})
diff --git a/config/avia.yaml b/config/avia.yaml
index 1034bcd..1b25e00 100755
--- a/config/avia.yaml
+++ b/config/avia.yaml
@@ -11,7 +11,7 @@ preprocess:
     lidar_type: 1 # 4
     scan_line: 6 # 32
     timestamp_unit: 1           # the unit of time/t field in the PointCloud2 rostopic: 0-second, 1-milisecond, 2-microsecond, 3-nanosecond.
-    blind: 0.50 
+    blind: 0.5 
 
 mapping:
     imu_en: true