Fixed merge conflicts (hopefully)