Fixes a few merge conflicts