Social conflict over property rights: the end, a new beginning, or a continuing debate?