Detect conflicts
Detect deletions/additions