add modality table
fix merge conflicts