read data from file and save in local memory
probably unchanged files; Git wants me to commit
Merge conflict resolution
Merge conflict resolution