Fix merge conflicts in members.js
fix merge conflicts in divisions.html