Merge manual S2