CLN: fix conflict leftovers