Merge did not work, so I had to fix it myself...