merge modif logout controller