Fix resolve conflict