made some changes locally on my pc in merging_test.txt. Now I'll change it on github and locally to get merge conflict

Signed-off-by: Mikkel Urban Kajgaard <muk@trackunit.com>