What happens when hunter-gatherers and farmers come into conflict over land, which the latter utilize far more efficiently (in a calories / sq km sense)?

Note that as population densities rise, land becomes a bottleneck for a population more than number of available hours.