* changed python-mode to jedi
* resolved conflict