comments with new style
resolve conflicts