Add handling for fixing data link when duplicated data is combined
Fix #8 and #13