Resolve merge conflict, add vim support for .js