fixing sync/merge issue