added email to footer
resolve conflicts