Changes to vowpal web=page
remove vowpal resolve conflict
vowpal