correct any of the merge items that failed

there are a few fixes to come.