Fix merge conflict

Description

None

Environment

None

Assignee

Kiran Muthoju (Bob Swift Atlassian Apps)

Reporter

Kiran Muthoju (Bob Swift Atlassian Apps)

Labels

None

Fix versions

Priority

Major
Configure