Merging conflicts
Bugfix - extra NEGATE when merging conflicts from git