members create logic complete
merge
gemfile conflict merge