Resolve conflicts _Originally posted by @dtecho in https://github.com/EchoCog/bolt.echo/pull/38#pullrequestreview-3032667828_
Resolve conflicts
Originally posted by @dtecho in #38 (review)