Merge "Add error message for download -c conflicts"