Delete directions.html.orig

delete conflicted file