Resolve Conflicts with New User