Update floatfixed.js
merge conflict