Updated behaviors
Skip files that does not end with .js
Mixed merge conflict