Merge improvements