CherryPy POC added
Conflict solved