Sync

Sync as issue suggested
Please take another look at the merge function.