add sheet modifications
conflict resolved