earth
conflict resolved