Set up login for the site
Resolve conflicts