conflicts removed
log cleared