added first line to c.txt command line
resolved conflicts
added d.txt file
added first line to d.txt file command line