fix conflicts[C
fix conflicts