add near
resolve conflict