fixed version resolution conflicts