update version to 0.0.5
Resolve conflict