Add time dilation error compensation to Actor update
Fix merge conflicts