Comiiting for conflicts
Maybe fixed conflict
changed AuthUser to have username