- Resolving pull conflicts.
Merge branch 'master' of github.com:SOLA-LESOTHO/messaging into working
 - Added Dispute Check and validator.