Fixed merge conflicts finally (hopefully)