What two groups were at conflict with one another over the harvesting of buffalo and came to a resolution by signing an agreement in 1844?

The two groups in conflict were the Indigenous Plains tribes and the American settlers, and they came to a resolution by signing the Treaty of Fort Laramie in 1844.