Fix the table scroll
Fix for table scroll
Fix merge conflict