Resolved missed merge conflicts. Updated formatting. Made mental notes.