corrections
Conflicts resolved
Conflicts resolved
reset temp
set