I made a mistake by merging, so I had to clean up the files that I
merged