fixed matching routing error
fixed merging errors