• fix merge conflicts

    @christophertino
    christophertino committed Apr 14, 2020
    596baf5