arrange patch to sync with current cm source