Add hooks for handling clobber on merge
Use new hook system for unclobering