merge conflict
enable helm-mini