make conflict
resolve conflict