title link log as updates
resolve conflicts