fix merge conflit on authentifier and session