fixed up merge