conflict fixes, safe houses feature