merge bugs
merge bugs

changed log name