Conflict Resolution

Please review both notes and make the appropriate corrections in the Resolved Note. The Resolved Note is the one that will be saved.

Conflict Note

Resolved Note