food.cc, religion.cc: remove merge conflict markers

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

Created by  Steven Noonan  on October 1, 2009
NRHXUQW5CH4SXJ3KRETPKLUVFZDR5CGSFXFLVIF6BSAXGMWPNECAC
Change contents