I am working on a project based on Magento Commerce Cloud.

I am trying sync code from master to Staging branch but i am getting failure message.And when i view the logs,i am seeing merge conflict w.r.t some files.

Can anyone please guide on how can i fix this

Thanks!