polyml: fix conflicts.