removed conflicting dependencies