Fix merge conflicts - SemanticDiff

Commit

5 years ago

Fix merge conflicts This is done outside of the merge to highlight the changes, hopefully.