Fix merge conflict issues surrounding inertia.euler_rotation.