setting texgyreheros-regular as the default font type
fixing merge conflicts