version conflict fix