missing a closing div tag when i fixed merge conflicts