Fix messed up merge