add credit working
solving merge problems