Update Jaunts view
Resolve conflict