fix merge conflicts...ryan's original commit