exiting merge hell ;  adding python-mode