pycheckers fixes
fix conflicts