Merged edit