add the download action
fix the conflict