Git error overwrites in file