I hate merge conflicts

Should be good now. Added footer.