The Minneapolis City Council will hear public comment on the city's handling of a year-long dispute between neighbors that culminated in a shooting last month.

The Minneapolis Police Department announced a new partnership with the NAACP on Tuesday that will aim to deal with neighbor disputes, before they turn violent.

A partnership announced Tuesday will pair the Minneapolis Police Department with the city’s NAACP and other groups in an effort to resolve conflicts between neighbors. It comes after John Sawchak shot his neighbor after repeated calls to police.