added status column to conflicts table