merge gaside1 into s7