comment out the automatic text resizing functions because they were causing infinite loops
fix merge conflict in scripts.js