additional info, font color change
resolve conflicts
merge conflicts