fix version conflicts