resolve conflict again