interim commit before needCheck and dependency refactoring
- performance fix: know the 13x13 matrix layout is less than 200ms
- improved conflict resolution
- test scripts almost ok