Update version to 1.0.8
Fix merge conflict