WOrking on hand tracking
Fix conflicts