work on user merging