added user account merging, closes #30