fixed bug in Handler.py
fixed conflicts