merge commit
fixed merge issues