js.php was the victim of a faulty merge -- committing it back to its last stable state, and will intelligently apply updates subsequently...: