Conflict in `javascript/extractor/src/com/semmle/js/extractor/Main.java` resolved in favour of `master`.