Update notes for submitted changes

* Fixes a slipped in conflict in LoginController.