FIX MERGE CONFLICTS: Add authorization

And then merge.