resolved merge errors in FeatureEng.py