Bitbucket merging conflict problem

Job ID: 35318360

Budget: ₹600 – ₹1,500 INR

Need to merge bitbucket develop and master branch, but facing conflict problem need to solve it.
Related categories: Aws Lambda DevOps