fixed a merge bug under larch