+2 tasks
resolve merge conflicts
version -> 0.11.0; Update for NEWS