fix missing c
fix conflicts