T107 Balance accounts
T107 Fix git merge fail