Open/Close account
Solve conflicts