gitignore opdateret
conflict changed