In the last point of `Fixing PR when other changes get Merged leading to Conflicts`, `--force` option is being used unnecessarily. This can be removed. @chhavip should I send a PR for this?
