fixing up merge again