Uploading the index page because of merge conflicts meant I deleted them. Need to work out that process.