new git-hook-post-merge hook and missing files