auth added
confilict fixed