downloads - resolve conflict