Fixed conflict output.
Bump version.