update resolve conflict