Merging changes with views and assemblies being right.