Resolves conflicts

We merge-ready now