edit c
merge