refactor: move detect conflict to main branch #380

Job	Run time
setup-feature-database	13s
deploy-feature-to-openshift-development	8m 25s
update-jira-issue	6s
	8m 44s

Provide feedback