Update formats.js

Fixing conflicts.