cleaned up merge