Change acceptable node versions
Resolve merge comflict