fixed post-merge hook