fixed merge issues -Danica