add roles
merge from remote