Resolve conflicts not correctly merging files in newer Bitbucket versions

Description

None

Environment

None

Assignee

Andrey Levchenko

Reporter

Mohammed Davoodi

Labels

None

Priority

Medium
Configure