edit post user name
fix conflict
fix conflict