TF400550: Conflicts that contain property changes cannot be resolved as AutoMerge using this version of the client. Please ...