Fixed merge conflicts (again...)