Changed to use no username
Resolve conflict
resolved conflicts