refixed minor source model merge issues