Bug fixing contas
merge