Completed user cabinet
Resolved conflict
Resolved conflicts