move merge_settings to common library

[ott/bsta] / botm-common

diff --git a/botm-common b/botm-common
index 599a7e9a41f68c89f64cd982db730167d2acf28e..111fb5f38624401ac7f332dd8bf7fa65e7bf5b23 160000 (submodule)
--- a/botm-common
+++ b/botm-common
@@ -1 +1 @@
-Subproject commit 599a7e9a41f68c89f64cd982db730167d2acf28e
+Subproject commit 111fb5f38624401ac7f332dd8bf7fa65e7bf5b23