merge almost complete