user able to accept chum requests and see chums
conflicts fixed