user stuff
resolve conflicts
username
resolve merge conflicts