Add account jade file
Fix accound jade merge conflict