new versions available, this resolves conflicts