fixed merge error (#20)