added third comment
fixed merge conflict