Merge prior to syncing CW Dervish updates