resolve conflict with origin.