Reduce merge conflicts

:trollface: