Physics
Fixing conflicts