start content
resolved conflict, merge