Fixes to files that should not be tracked
Merge the conflicts