Fixed merge conflicts for real