partial ConflictPage
Merge branch 'master' of https://github.com/lukemetz/hfid_room_registration