merge so
fix order