log changes
fix merge conflict
log files