Fix tabs text overflow
Trim spaces in merge msg
Rename method. Should be public
Render a maximum of 6 files by default to avoid DOM overflow