Accidentally made edits to master, not assocaite-listings-with-user branch. Attempt to commit and resolve comflicts.