migrate
fixing conflicts
add yo username to users, yodawg is to yos