uncommented some stuff
grid merge conflict