stuff
hard redirect in code.py
fixed conflict