@sqliu yours is much clear! My purpose here is to reduce the future rebasing effort as possible as it could.

If the original 2 statements are touched, one day upstream also has changes to them, we will get conflicts when rebasing, am I right?