alias changes
update bash
merge