Refactoring of incoming SMS handler
Resolving conflicts