Updated the commented test version of more robust sync-rebasing