dependency conflicts resolved