updated deps
resolve conflict