fix
source merging