fix user auth merge issues