Fix issue:65 where the whole history could be shown in builds after a merge
Fix style