update dependencies and version
resolve conflict