adding dependencies
resolve conflict