just tinkering
fixed merge issue