comprehensive auth merge