Not sure if this should be a question or an idea (because it may be a bug) Anyway, I have been working on my desktop, committed everything on main. And then updated the project on the laptop. Now I had done a few things on the laptop but it was severla days ago and the working copy was the desktop. A few conflicts and I wanted everything from “theirs”. And one of the conflicts gave me. System.InvalidCastException: Unable to cast object of type 'Mendix.Modeler.Projects.Module' to type 'Mendix.Modeler.Common.IDocument'. at Mendix.Modeler.VersionControl.Status.RevStatusControlEto.TryGetDocumentFromZoomedInLevel(ZoomedInLevel& documentLevel, IDocument& document) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl.View\Status\RevStatusControlEto.cs:line 710 at Mendix.Modeler.VersionControl.Status.RevStatusControlEto.BeginConflictResolution(ContentsConflictState contentsConflictState) in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl.View\Status\RevStatusControlEto.cs:line 582 at Mendix.Modeler.VersionControl.Status.RevStatusControlEto.<>c__DisplayClass52_0.<ShowConflictSummaryToolbar>b__1() in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl.View\Status\RevStatusControlEto.cs:line 564 at Mendix.Modeler.VersionControl.Status.ConflictSummaryToolbar.<CreateResolveButton>b__3_0() in C:\Users\Autobuild\workspace\AppStudio4.0-Build\modeler\Mendix.Modeler.VersionControl.View\Status\Toolbars\ConflictSummaryToolbar.cs:line 40 at Eto.Forms.RelayCommand.<>c__DisplayClass0_0.<.ctor>b__0(Object obj) at Eto.Forms.RelayCommand`1.Execute(Object parameter) at Eto.Forms.Button.OnClick(EventArgs e) at Eto.Forms.Button.Callback.OnClick(Button widget, EventArgs e) at Eto.Wpf.Forms.Controls.ButtonHandler`3.<Initialize>b__14_0(Object sender, RoutedEventArgs e) at System.Windows.EventRoute.InvokeHandlersImpl(Object source, RoutedEventArgs args, Boolean reRaised) at System.Windows.UIElement.RaiseEventImpl(DependencyObject sender, RoutedEventArgs args) at System.Windows.Controls.Primitives.ButtonBase.OnClick() at System.Windows.Controls.Button.OnClick() at System.Windows.Controls.Primitives.ButtonBase.OnMouseLeftButtonUp(MouseButtonEventArgs e) at System.Windows.RoutedEventArgs.InvokeHandler(Delegate handler, Object target) at System.Windows.EventRoute.InvokeHandlersImpl(Object source, RoutedEventArgs args, Boolean reRaised) at System.Windows.UIElement.ReRaiseEventAs(DependencyObject sender, RoutedEventArgs args, RoutedEvent newEvent) at System.Windows.RoutedEventArgs.InvokeHandler(Delegate handler, Object target) at System.Windows.EventRoute.InvokeHandlersImpl(Object source, RoutedEventArgs args, Boolean reRaised) at System.Windows.UIElement.RaiseEventImpl(DependencyObject sender, RoutedEventArgs args) at System.Windows.UIElement.RaiseTrustedEvent(RoutedEventArgs args) at System.Windows.Input.InputManager.ProcessStagingArea() at System.Windows.Input.InputProviderSite.ReportInput(InputReport inputReport) at System.Windows.Interop.HwndMouseInputProvider.ReportInput(IntPtr hwnd, InputMode mode, Int32 timestamp, RawMouseActions actions, Int32 x, Int32 y, Int32 wheel) at System.Windows.Interop.HwndMouseInputProvider.FilterMessage(IntPtr hwnd, WindowMessage msg, IntPtr wParam, IntPtr lParam, Boolean& handled) at System.Windows.Interop.HwndSource.InputFilterMessage(IntPtr hwnd, Int32 msg, IntPtr wParam, IntPtr lParam, Boolean& handled) at MS.Win32.HwndWrapper.WndProc(IntPtr hwnd, Int32 msg, IntPtr wParam, IntPtr lParam, Boolean& handled) at MS.Win32.HwndSubclass.DispatcherCallbackOperation(Object o) at System.Windows.Threading.ExceptionWrapper.InternalRealCall(Delegate callback, Object args, Int32 numArgs) at System.Windows.Threading.ExceptionWrapper.TryCatchWhen(Object source, Delegate callback, Object args, Int32 numArgs, Delegate catchHandler) On a related issue with collaboration (and this is a question!) – if a new module is added to the marketplace, is that part of update and so will be proporgated to the other machines?