Fixed merge conflict
Fixed merge conflict again

I'm really screwing this up here :)