What versions are showing for this template in the outdated template list?
I will have to see if I can reproduce this, but without merging, the recommended approach is to make a note of your changes, revert the template and then re-apply the changes. This ensures that you incorporate the most recent changes.