some things got lost in the merge