Better logging
Merge Conflict