bug-solving about the user merge
bug-solving about the user merge
bug-solving about the user merge