WAIVER AND AMENDMENT TO CONVERTIBLE PROMISSORY NOTE