changed example.c
merged conflicted example.c