Index/Conflict.xs: Use a real object to represent conflicts
Index/Entry.xs: Added blob()