Adding entries and removing file= lines
Merging changes