Fix slightly messed up merge.