split changes and sync code