Fixed merge conflict

I heard you hate merge conflicts