clean up conflict code
add sign up newsletter to form to footer