devise user up
lisa is a contributor
user working
fixed conflicts
working user