Edited C.txt for the merging conflicts