Progress on the note rendering word wrap border problem
Fixed Merge Conflicts