enh: authentication
fix: merge conflicts