added http authentication
conflict resolved