How To Resolve Merge Conflicts In Azure