adding lots of sync.
fixed conflicts.