ignore log file
resolve conflict