Fixing misktakes with merging

I should check and test my code more often...