pushing up authentication
merging conflicts