added authentication
Resolved conflicts