Merge Auth into Master