Fixed merge conflict

I hate merge conflicts...