• Fix bug when trying to merge food conflicts
