MERGE NOTICE

I should learn how to do this easily with git