fix merge issues

Ref #62