Removed files resetbutton
Fixed mergeconflict