ready to pull
fix router conflict
horoscope add