fix merge issue : final commit
fix mergings

fix CLI.h and fix for Interpreter.h