Corrected.
Merge branch '2' into 3