Fix conflict in util.py.