added C
merge the conflict