Updating meeting notes
Attempt to fix merge conflict