conflct c
merged file