merged trunk