updates
resolve conflict