Works, but does not render on page
fixed merge conflicts