members and merge conflict resolved