ISSUE-63: Fix conflic and overide code

https://github.com/andytruong/at_base/issues/63