Added bubble combine and fixed physics sync.
merge