fix(conflicts): fix merge conflicts
fix(conflicts): fix merge conflicts

Signed-off-by: Thomas Nyambati <24a45e4070ed8b312773420ed6b4c8b138f846da@andela.com>

nyambati/express-acl,andela-thomas/express-acl