updates for pull
fixed merge errors