added obiWanKenobi
Fix conflcts and add obiWanKenobi