fixed dependency conflicts