Just Synching, working on AI
Fixing conflicts