Update notes for submitted changes

* merge.py use a class to represent template syntax