water maker and food maker can fill with 'water' and 'food' respectively
resolving merge conflict