Update to into3 non-hiearachical merge