I had a dispute between 2 clans, didn't deal with it immediately and accidentally sent one off to build a farm. A few turns goes by and this clan is now unhappy, won't work and now I can't resolve the dispute unless I abandon the farm.

I have a couple suggestions for how to solve this:
1) Allow to resolve disputes no matter the location
2) Once a resource building is built, let a clan leave without destroying the building