fixing dependency conflicts