#155 #257  Resolving conflict in members controller

#155 #257   @osherifo