How To Resolve Conflicts In Azure Devops