fix
fix
push
Merge branch 'hotfix/hjelp'