Finish/fix up merge