passport
fix conflicts
passenger implemented