changed kontakt
solved merge