updates
fix merge conflict
now have inline code blocks via css