Upgrade the client post-checkout hook to automatically reset the merge attribute...