Handling Merge Conflicts With C