remove lines added cause of the confilcts that broke the ch.py