members layout
change in members layout
conflict fix