vectoriser: fix conflicts