Fixing up merge errors