Prefering aliases instead of the post-merge hook

Post-merge hook is still used to keep the settings
up-to-date.