diff --git a/.settings/org.eclipse.cdt.core.prefs b/.settings/org.eclipse.cdt.core.prefs
index d722962b..cb53cecc 100644
--- a/.settings/org.eclipse.cdt.core.prefs
+++ b/.settings/org.eclipse.cdt.core.prefs
@@ -1,3 +1,6 @@
+=\=\=\=\=\=\=
+<<<<<<<=HEAD
+>>>>>>>=refs/remotes/origin/Over_The_Air_Update
 eclipse.preferences.version=1
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/BATCH_BUILD/delimiter=\:
 environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1476804786.212420495/BATCH_BUILD/operation=append
diff --git a/partitions.csv b/partitions.csv
index 81ae692d..086865b4 100644
--- a/partitions.csv
+++ b/partitions.csv
@@ -3,5 +3,5 @@
 nvs,  data,  nvs,  0x9000,  0x4000,
 otadata,  data,  ota,  0xD000,  0x2000,
 phy_init,  data,  phy,  0xF000,  0x1000,
-recovery,  app,  factory,  0x10000,  0x100000,
-ota_0,  app,  ota_0,  0x110000,  0x2F0000,
+recovery,  app,  factory,  0x10000,  0x140000,
+ota_0,  app,  ota_0,  0x150000,  0x2B0000,