Create users and home page
Resolve conflicts and deletions