t
update name and email
test remote with conflict