d
conflict resolved