use normal instead onormal for non-inherit edge.
modify conflict.