merge conflict fix and added methods for sorting out where user is creator and where only participating
merge conflict fix