Update fb.js
Conflicts solving