The only way to fix this is to click on the template and then click on revert. Please note, any customizations made to this template may get lost if you revert the template so make sure to copy any changes you made to the template for you to put them back again if wish.
This not correct. Another option would be to re-save the modified template - this will make the message disappear as well.
Afterwards a compare against master should be done so no necessary changes do get missed.