revert remote merging logic