[UPDATE] not quite sure what I've done or what works but there is a login page and signup and things (taken from the example)
[CONFLIX] conflict resolution