manualy resolve some merge issues from original skosprovider_sqlalchemy