save
resolve conflict for merge