Can detect conflicts now.
Merged conflicts.