moving hook to post-merge