Updated diff merge