Add Square intersection test
Conflicts