How To Resolve Merge Conflict In Azure Devops