Fix up messed up merge