Remove conflict markers. Adjust date: 2006-03-23 -> 2006-04-12