remove and fix

Author: napalmpapalam

.npmrc

@@ -21,11 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `all`: `tsc-alias` package to use aliases in TypeScript
 - `root`: `yarn rsc` Release Sanity Check script
 - `root`: Rollup and configuration file to build packages for CDN
-<<<<<<< HEAD
+- `@distributedlab/tools`: Handling big numbers
 - `@distributedlab/tools`: Add tests  for time.ts and duration.ts
-=======
-- `tools`: Handling big numbers
->>>>>>> main
 
 ### Changed
 - `root`: Updated `README.md`