try to fix cell height
merge conflict with master branch