clean files that we dont use
Merging conflicts