updating with correct merge order