added h1 to line 18
fixed merge conflicts