Add a join button on conflict error
Cleanup stash handling for the error template, and add a button to join the room
Should fix #12