Add resolve-and-apply to main and use it
Fixes #1120
update-in: use resolve-and-apply (honor aliases)