Fix files from merging