comitting .js changes
resolving merge conflict