Update jaunt view
Resolve conflict