Adding credentials
Solving conflict