resolve merge
update aliases