fix a null and formatting
conflicts
learn css