fixed conflicts
added devise invitable