added username
fixed rebase bug