Fixes conflict for jabr.py