committing config for merging. may error e
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/darpell/monica.git
Merge branch 'master' of https://github.com/darpell/monica.git
added OverlappingMarkerSpidifier for rsikmap in mobile