A lot of user stuff done
All my stuff
merging
solved some merge conflicts
almost done merging
merged some stuff