trying to fix text overflow in card text divs
fixed merge conflict in script.js