fix conflict and add comment to NPolyline constructor 2

Signed-off-by: Jimmy Fjallid <jfjallid@gmail.com>