Fixed merge conflicts

from
https://github.com/TedGoas/Cerberus/commit/3a1dc1c44397ecce0a35ebb860daf
0d5a5b64fbb