weird .pyc change!
finishing merge