Remove confirmable from user table
recommiting
merge
fixed conflicts