created comment form
fixed merge conflict