change username to name
solve conflict