mostly working
git merge konflikt