feature 1
newfeature
a
Update endaen
bør crashe
Merge conflict
Merge branch 'feature'