still fixing addcomment's style
Resolve conflict in style