Resolve merge conflicts on #21