Fixes merge conflicts for #62