normalDmet.py conflicts resolved