new update
resolve conflict