controllers modified
Conflict resolved
Search by location and skills added