resolve conflicts, add content