Merge patch-1 with patch-2