Fixed all merge conflicts
Fixing more merges