merge conflict in git

Job ID: 32317629

Budget: $10 – $30 AUD

I'm getting a merge conflict in git, i need some help to resolve it

See screenshot attached
Related categories: Git