tex rettelser
merge