added user merge capability, also flat formatting