Merge conflicts resolution

Merge conflicts are resolved.

Additionally, removed link of `ReviTestServices` from `sln` because it can't be loaded.
Formatted `DyanmoConverters.xaml`.

@Benglin, please, take a look.