addroutes d1-4
fix conflicts