Partial merge with GUI-Rebuild