Fix version conflicts