Remove conflicts from lock file
Downloading file page added