Add param to delete workflow API to clear status even if resources ex…

…ist (opensearch-project#719)

Signed-off-by: Daniel Widdis <widdis@gmail.com>
Signed-off-by: martinpkr <devilmarti@abv.bg>

CHANGELOG.md

@@ -16,10 +16,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 ### Features
 ### Enhancements
 - Add Workflow Step for Reindex from source index to destination ([#718](https://github.com/opensearch-project/flow-framework/pull/718))
-<<<<<<< HEAD
 - Add param to delete workflow API to clear status even if resources exist ([#719](https://github.com/opensearch-project/flow-framework/pull/719))
-=======
->>>>>>> 4ee2171 (Added workflow step for ReIndex Step (#718))
 
 ### Bug Fixes
 - Add user mapping to Workflow State index ([#705](https://github.com/opensearch-project/flow-framework/pull/705))