Fix post-merge hook