hello from master
fixed merge issues