Fixed post-merge hook