[git-hooks] update post-merge hook, drop make.conf cp, no longer required