fixed up other bad merge