Fix merge and bump version.