sign flips
Merge conflicts resolved