Completed Change merging

Removed the note code from merging in commit
SHA: 815881548336064eaedbc287dce9aefd38e3a2c5