removed comment
fixed merge issues