calculate distance
conflict commits