comments and styles
resolved conflict
resolved conflict