add N17 W[-20,40]
resolve merge conflict