stuff

fixed conflicts in the c src code