Resolve conflict from merged version

At line 799, resolved:
<<<<<<< HEAD
$obj->normalize($argv[2],BasicModel::NORMALIZE_MODE_APPLY, True);
=======
$obj->normalize($argv[2],BasicModel::NORMALIZE_MODE_APPLY);
>>>>>>> flathat/master
keeping HEAD.