route tests removed
conflict fixed