resolve duplicate classes conflicts from last merge
corrected failed test due to merge with origin/master
experiment modifying the optimization architecture