cat and grass
conflict resolved