nieuwe data
conflict resolved