added pre-push hook
added post-merge hook