fraction
conflict merged