Simple changes
Fixing the conflicts.