edit function set height for div sprint
merge code and fix conflict