Hiding scrollbars
Resolving merge
Fixed tempDiv error