Master auth merge