merge header
add de logout