The Singularity is Not Near Enough:post 4558
resolve conflicts