fixed conflict
fix credentials.h