Fixed merge conflicts (oops)