Fix Conflict The Jesus Way

od Faith for Everyday