Fixes some merge-y things