Added user merge (WIP)