Make it clear that you're merging into your current version

This might be excessively pedantic, but it's best to be clear
about the "direction" of the merge, to avoid later confusion
for people.
Use slightly simpler / less colloquial English