fix merge conflict

ref #62