move local changes, a couple new aliases
merge