Reverse some merge fix errors.