Merge physics fix