FIX: Remove git merge artifact
FIX: Remove git merge artifact

eckhart/himlar,raykrist/himlar,mikaeld66/himlar,tanzr/himlar,mikaeld66/himlar,TorLdre/himlar,tanzr/himlar,norcams/himlar,raykrist/himlar,TorLdre/himlar,erlendbm/himlar,eckhart/himlar,mikaeld66/himlar,TorLdre/himlar,eckhart/himlar,norcams/himlar,mikaeld66/himlar,tanzr/himlar,mikaeld66/himlar,raykrist/himlar,TorLdre/himlar,TorLdre/himlar,eckhart/himlar,norcams/himlar,raykrist/himlar,norcams/himlar,raykrist/himlar,tanzr/himlar,tanzr/himlar,norcams/himlar,erlendbm/himlar