merge members
Resolved conflicts