resolved conflicts in mincde.py