log start
resolve conflict