Fixing merges
Fixing more merges