Fix messed up merge.