Onshape identifies all possible geometrical conflicts at the feature level prior to merging geometry changes from a branch, and will not make changes to features that have conflicts. In addition, Onshape notifies the user and highlights possible conflicts in red so that they may be resolved prior to the merge operation.