fix path problem
bump version
resolve conflict