fixed my merge errors.