#155 #257  Resolving conflict in members controller