This is a local change, not pushed upstream.
Fantastic, if the merges do not conflict, they are both included.