_references.js added
Conflicts resolved!