fixed messed-up merge