Local fish shop feud will be resolved by council