setup auth~
fix merge conflicts