added a comment
resolved conflict