Your hook really shouldn't be running on the merge commit unless you have conflicts in your merge.