registry fix script
proper sync group implementation
 manual merge