Merge conflict resolve in DO.py